From: Katsumi Yamaoka <katsumi@flagship2>
Date: Sat, 3 Jul 2010 11:08:43 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~18
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=16106cdc20f5ab0df22841e88bf9d6575bc8c6f7;p=emacs.git

Merge from mainline.
---

16106cdc20f5ab0df22841e88bf9d6575bc8c6f7